iconGrid/iconGridLayout: Make sure to always update best size

When selecting the best icon size for the available area, we
iterate from the biggest icon size to the smallest one, and
stop when finding a size that fits the available area.

However, the 'bestSize' variable is only updated when the
available area is positive. This is problematic in super bad
cases like when none of the icon sizes actually fit the availabe
area, which was hit with a previous iteration of this branch.

Make sure to update the best size while iterating, so that the
smallest size is selected even in such bad cases.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1510>

diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index 7275a6a41aa50fe04b4ea6d36b583e77ebc04f68..93fc6219fa5d6a3406b49f4a2d20609645161cd1 100644 (file)
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -429,10 +429,10 @@ var IconGridLayout = GObject.registerClass({
                 this._pageHeight - usedHeight -  rowSpacingPerPage -
                 this._pagePadding.top - this._pagePadding.bottom;
 
-            if (emptyHSpace >= 0 && emptyVSpace > 0) {
-                bestSize = size;
+            bestSize = size;
+
+            if (emptyHSpace >= 0 && emptyVSpace > 0)
                 break;
-            }
         }
 
         return bestSize;